Merge "when automatically add aLaCarte VfModule, rollbackOnFailure is true"