cb98f5 forward port local changes

Authored and Committed by Karanbir Singh 7 years ago
    forward port local changes