merging with current 2.10.93
merging with current 2.4.12