Merge branch 'master' into topic/secretom