chore: correct issues found during recent develop commit review
#12201
+2
−4
develop commit review
#12201