2.x branch 'snapshot'