Brought up-to-date with latest v1.65