Merge changes to config examples and configuration issues