open master for 2.3 (#4151)

3 files changed