Revert "Revert "Merge branch 'feature/6702_splitting_settings' into develop""

This reverts commit 5f626b9740123020bc6eb2b200ca700bbe0ed31e.
refs #6702. Fix error in test code.
Merge branch 'feature/6702_splitting_settings' into develop