BC-2352 #comment fixed for nullalbe