Merge pull request #899 from mdamour1976/master

BISERVER-10120 A lot of samples in bidevelopers are broken