Merge From  BinaryConstruct:master