main
Move element tag inline with summary text in history view
Merge main into branch, resolve history view conflicts