Please review the attached patch which addresses:
This was tested on Fedora 23 by doing the following: