Added performance warning in docblock and changed return type to null/string
Merge branch 'feature/pagepartcontroller' into 2.3