Merge develop into master. Include the fix for the editor that prevented to save a custom docker image.