Merge pull request #1862 from gilmoskowitz/i24559_xtlocks