Merge branch '918-number-of-user-provided-data-overlays-is-not-increasing-correctly' into 'master'

Resolve "number of user provided data overlays is not increasing correctly"

Closes #918

See merge request !907
32 jobs for 920-project-privileges-checkbox-change in 13 minutes and 10 seconds (queued for 23 seconds)