-- HR-211 Modification to resolve error while upgrading