Merge branch 'master' into expandable-fields-simplify