Reorder back of the variables.
Merge branch 'entity-reference' into callback-function
Review fixes