Fixed Deprecated on non deprecated API operations issue
Merge branch 'master' into cloudesire