Merge remote-tracking branch 'ivan/bug/3606_make-base-config-test-pass' into develop