Merged sub changes