294 - On Board

tracker 24694
Merge pull request #555 from gsn/master

294 - On Board