Merge "Allow more error codes on multiple block modes failure. Updated tests to use `APPLICATION_ID` along with `APPLICATION_DATA`." into main