default hash is uncommented by default again
Merge remote-tracking branch 'origin/develop' into develop