Fix WK-272
merged