Arathy | TRUNK-4125 | incorporating comments