AT: commiting recent merge from trunk