Merge "Fix various issues in ordering of grouped bindings."