Merge pull request #4718 from metalbear-co/cor-1796