Up to 11.1.3 with weird errors
Merge branch 'master' into following-users
Up to 11.2 with no errors
Up to 11.2.2 with no errors
Up to 11.2.3 with no errors
Up to 11.2.4
Up to 11.2.5
Up to 11.3
Up to 11.3.4