294 - on board

tracker 24694
Merge pull request #585 from gsn/master

294 - on board