allow assigned as object
Merge composer/master