Merge "Update BRZ removal"