Merge "Add unit test to verify option propagation from starter to modifier." into pi-dev