Merge "Allow customized remote_agent configuration"