Merge "Update Statement Service." into mnc-dev