Merge branch '4.19'