Merge branch 't/oss_error_message_fix'