(ITS#7111) Forward bug-fix commits to ITS