Merge branch '8.x-1.x' into 2273393-formatters