SP-21: Changed notes to follow the general format of flat settings to avoid causing issues when using the empty string "" as value for notes
Merge remote-tracking branch 'kaspermarkus/SP-21'

* kaspermarkus/SP-21:
  SP-21: Changed notes to follow the general format of flat settings to avoid causing issues when using the empty string "" as value for notes