LUN-600 -- removed blabk and null = True