master
This PR is related to BAEL-7427 (#16028)
BAEL-7490 read write file in separate thread (#15664)