ATTENTION: Requires the merge request EMADL2CPP!29 (merged)
This will create a new commit in order to revert the existing changes.
