Fix import of core views.
Merge remote-tracking branch 'template/master'