Merge latest code 27 Dec 14