Synchronizes latest changes from unstable branch into master c.f. commit history changes from 2018 are
please compile OF with these changes first.