Fix for UATNBNXR053 - 2nd Revert
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design