merge fork of 8.5 branch