merge from 0.96