Upgrade 2.2.5 to 2.2.6: secondary hanging