Merge "Handle annotated-input which has 2 properties"