Add phpDoc
Add phpDoc
Add ToDo comment
[BUGFIX] Only try to remove dynamic field suffix for actual dynamic
fields