Merge 1.8Dev

Signed-off-by: benjamincharlton <benjicharlton@gmail.com>