Merge wiki tool config changes to master