Sdev 453

Goes along with a pull request in labgeeks buildout for SDEV-453.