Merge pull request #4712 from metalbear-co/vladr/int-580-new