Add missing template warning
Merge remote-tracking branch 'origin/experimental' into experimental