Fixed issue on router classes with alternative approach
Bumped version/changelog
Merge branch 'release-3.1.4' into develop