23.1, cleanup template names
23.1, probs 9-12; add data-backdrop = false to html template
Merge branch '23.1' into dev