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