[SWITCHYARD-340] Merged pull request 242 from gnodet