Merge pull request #12869 from dereklewis123/CW-892