Release #5636: Fix bugs