Fixing up tests related to #SB-188
Merge branch 'develop' into 4.0.0