Merge to v5.3.1 (cherry picked from commit be538b4f69)
be538b4f69
and single point of control for all uses