AOR and related commit by Amit
Commint Merge Amit