Merge "Restore crypto scheme check." into pi-dev