(SW-JIGUGE-35801): Add U-00021567 and U-0002156C as corresponding