Merged with Ilteroi and Jamforce's changes. v.65.4