Merge pull request #1881 from gilmoskowitz/i24559_xtlocks