Modified-on-open patch has been incorporated into trunk