Merge pull request #1848 from gilmoskowitz/i24559_xtlocks