Merge from wampv1