GH103 - port-save-mechanism3
Merge remote-tracking branch 'origin/GH103-port-save-mechanism3'
Merge remote-tracking branch 'origin/master' into GH274-descriptors-viewer-and-reload