PBI-10.x Meta-AutoAdd: defendguin (josh)