VE-1443: Addressed CR