port of fixes validated in kstep tree, bump version