Merge "Update the smearing methods in framework." into oc-dr1-dev