Merge "Add missing param for golden configuration"