remove definitions defined in other interfaces
Merge branch 'refs/heads/master' into 2.3