4b0badc92d
* commit '3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd': Bit of code cleanup (issue 11648206)
* commit '3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd': Bit of code cleanup (issue 11648206)