this is a merge of 3 latest commits.
change 1
chang 2