Merge branch 'hotfix/3273'

Close #3273
fix Undefined function DocBlockReflection::factory error
Merge branch 'hotfix/3283-master' into develop

Forward port #3283