xmas update 3 - merge from master