Merge branch 'cont-integr-2' into 'development'