Merge "CPS-566: Can't access grandparent node through ancestor axis"