Created by: STRML
This commit can completely break production apps and this or a similar hotfix needs to be deployed ASAP.