Merged release-1.22 and resolved conflicts