Merge "Set the intendend ref to the Bill of Material SM" into release_1.0.1_java