Merge "Move DO protected packages to ActiveAdmin" into tm-dev