Misc addendum to CORE-14271 (#1529)