[#11866] Coding standards/best practice fixes