Merge "Config update to fix whitespaces issue in payload"