Contributing: Updated the guidelines

Fixes gh-6983