Merge branch 'feature-synnefo-0.14' into develop