Implemented suggestion discussed in HHH-5684

This needs to be kept at 3.18.1-GA.