refs #8376; added comment and applied patch on other files