Delete template / return Cannot export sub template (#352).
Merge remote-tracking branch 'origin/develop' into develop