implement method stub getContentId
Merge branch 'master' into 2.1