This closes #1298 (cherry picked from commit 5e156b9ddec46d6b7d1336bb88136d8826972e7a) Conflicts: dev-support/bin/yetus-wrapper
This closes #1298 (cherry picked from commit 5e156b9ddec46d6b7d1336bb88136d8826972e7a) Conflicts: dev-support/bin/yetus-wrapper