Feature-hold on 2.0.1+N, +further automated testing thoughts