This patch consists of patch#4 as well.