Merge "Establish permanently unavailable settings" into pi-dev