re-patch code for 1970 issue
Merge branch 'patch-1970-issue' into dev