Merge branch 'develop' into continuation-of-flights-tests