merge fix from r17217, bump patch level