Merge "[Review comments fixed]- macro names changed appropriately. [HD modifications...