Addressing comments to the PR (refs #3839)