include version setting
adding enforcer plugin
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop