(cherry picked from commit ebeb4b3e09) (cherry picked from commit ac1ccdd323) Conflicts: CHANGES
ebeb4b3e09
ac1ccdd323