Merge branch 'hotfix/3.9.54.1'
Returned Lost Functions
Merge branch 'hotfix/3.9.54.2' into develop