Merging main branch into development branch because all issues was initially fixed on the main branch.