Merge branch '22-notes-at-resource-management-view-are-not-checked-for-overflow-2' into 'develop'

Resolve "Notes at resource management view are not checked for overflow"

See merge request !15