Merge from dynamic-controller