Merge branch '25-from-2.15.1' into 26-misc
bug fixes
Merge branch '26-misc' into 28