Merge forward xdruple changes