VE-1651: Addressed CR feedback