merge BAM client changes