EA-1158/CP-5958: Addressed Review comments