Merge branch 'releases/2.2.0rc3'

2.2.0rc3 readiness
Forward optional parameters made clear & concise that they must match up with the routing config
Merge pull request #863 from eddiejaoude/master

Plugin forward optional params made more clear
Merge branch 'hotfix/863' into develop

Forward port #863