Updates to sample configuration files
Merge remote-tracking branch 'github/develop' into feature/documentation