[1016578] Addressed latest feedback