Update 3 files Closes #6736 See merge request !1932
mentioned in commit 4d2934a5
mentioned in commit 3b027fb5