Merge "Add monitor to sdk build" into idea133