updated interfaces for MR
Merge remote-tracking branch 'origin/master'