Thanks @ichuang! Closing this PR out as it's already been merged via a Hotfix on Release branch.