Target 0.6 branch of ardent