CDB-1915 proper check. /facepalm-me
Merge CDB-1915 into release/2.11.0