Fixed #2452, #2446, #2444, #2442, #2443.
Backend SHA: 00320b6f986d0a2d8b46a9dfe39dd801834b92f2