Merge new patches for 1.5.2

Signed-off-by: Ross Allan <rallanpcl@gmail.com>