Merge pull request #949 from IrimieBogdan/IAC-1143