Follow-up from "Last minute fixes for v32r0"

The following discussion from !910 (merged) should be addressed: