Merge pull request #2609 from directhex/xambug-30902