Created 6/24/2019 - to fic Topic 7.1 issue