CONTRIB-2828 Adding capability check