Merge "[AAF] v1.16+ compatible templates"