Merge branch '4.19' into 4.20