Merge "update customs in scenario"