[corlib] Improve 85aaf9b07485d5253de4c142985e32b00ad19347 change