backport 5.6 branch fixes
Rex Dieter • 4 years ago