merged binary data support into master