refs #3681 Change-Id: I00109197d05bc480a249f74b123e9a553acb25a3
refs #3071 Change-Id: I88e4fc1a8e33a0d61a95e2291cccc7b998647489