merge from 77822a2 at source