back-merge v1.26.0 to devel as v1.27.0
+mse220611
v1.27.1: use a content filter for mse220337
backport v1.27.1 to v1.26.1