Rebase to current develop branch of Avisota