(cherry picked from commit 2c4d5faf7f) (cherry picked from commit 7f2b905c81) Conflicts: CHANGES
2c4d5faf7f
7f2b905c81