No functional changes or fixes, code changes for internal source control only.
Date applied: June 21, 2022
