merge-train: #150 + #154 + #148 + #149 onto current main (conflicts resolved, tests green)

merge-train: #150 + #154 + #148 + #149 onto current main (conflicts resolved, tests green) #179