Minor merge from v1.60 prior to more big changes: