Merge adt-cleanups to master