xmas update - merge from master