Merge branch 'development' into 'master'

Fix bug that was triggering field catalog recreation in a loop when a field of...

See merge request !4