[SWITCHYARD-340] Merged pull request 541 from gnodet