Fixes Javadoc vulnerability
Inclusion new references on JIRA
Merge branch 'roadmap-update'