DEV-53017 - Don't show hard boundary error if configuration is within a soft boundary
Merge remote-tracking branch 'origin/dev' into dev