Merge branch 'r/18.x' of gregorydlogan/admin-interface into r/18.x

Merge branch 'r/18.x' of gregorydlogan/admin-interface into r/18.x #4179