[SWITCHYARD-340] Merged pull request 516 from gnodet