[AC21.4] Sync etags to v. 17.33