#1729 replacement PR for issue
Merge pull request #1802 from tysonn/conflict4-22b

#1729 replacement PR for issue