Get code from 3.6.x branch