Pull from Kitsuta:develop

Grabbing the 8.5 code