Merge "Change Logging and AFC Response Code Handling" into main