Subsequent codes may need it. Closes #1703 (cherry picked from commit 57bbec1f)
mentioned in merge request !1951 (merged)