Removes the need for duplicate templates for partial views. Of course we can have partial view only templates if necessary but currently we just borrow them from the partial view macros and update the header
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0