[Ashok] migrated from forked code.