Merge improvements from kseries (mainly inlining)