Merge branch 'develop' into adubel/fix-skiped-tests