Cherry picked features tested in master for 5.2