update from ADL master