Adding enableCellEditOnFocus for #521