Fixed IR handling
manual merge to remote