Enum processing, improved comment removal
Merge remote-tracking branch 'origin/develop'