This PR addresses feedback from auditors that reviewed program upgradability. Auditors used the following commit: 962d5fd as the reference.