Update code and version to fix testing for empty router list
Merge branch 'release/1.1.5' into develop