Merge pull request #4686 from metalbear-co/vladr/int-549