Merge pull request #5877 from slava-sh/iprima