Merge branch 'swallez-polymorphic-update'