Strict compliance with EE 1.14.01 and CE 1.9.0.1