backport 5.6 branch fixes
Rex Dieter • 7 years ago