Merge changes from topic 'feature/new-csar-installer'