#30 Disable field if not first version
Merge remote-tracking branch 'origin/develop' into develop