OSSN/OSSN-0077

In Progress:

https://bugs.launchpad.net/ossn/+bug/1562175