BISERVER-9809 - Updating the Samples (from KC)