Misc fix for v1.5.0-alpha.1
#3730
+22
−17
Merged
v1.5.0-alpha.1
#3730