Saves Note data and also supports different resolutions
Merge remote-tracking branch 'origin/develop' into integration
Merge remote-tracking branch 'origin/integration'