The failing patch for the 3111456 issue is rerolled to support Decoupled Router of the release 2.0.5.