FQA-1298: run test & fix bug on 21-Oct