Merge "Extend adoptable override to force on or off." into pi-dev