contrib mod updates
Merge branch 'dev_contrib_updates' into develop