Merge pull request #4663 from metalbear-co/vladr/int-558