Revert "revert"

This reverts commit 27253c2db799f839215bad07b577c3c9dc637967.
Revert "1.6.2 5.3.0 hotfix 1"

This reverts commit e3532db05dc6a9aa71ac47d43eb3f233058f643c.