Move the correct codes from 2.1 branch