update interfaces to avoid duplicate definitions
Merge branch 'refs/heads/master' into 2.3