Merging ice_charting branch with the latest master.