cleanup patches from !548 (closed) + addressed review comments
All this code except the commits that address review comment are from !548 (closed).
cleanup patches from !548 (closed) + addressed review comments
All this code except the commits that address review comment are from !548 (closed).