Update with SRM 582 D2 #1 and SRM template