Fix for UATNBFBL006 (Partial)

Pending Missing Row for Protection and Saving
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design