Merge pull request #4667 from metalbear-co/vladr/int-564