Clean up what can be edited when based on status.
Merge branch 'release/v1.0' into develop