CONTRIB-2828 Adding capability check
Merge remote-tracking branch 'upstream/master'