This commit refs #1793. If no feedback is received, issue will close