squashing 'feature-check-ssh' into 'develop'