FS-5498
FS-5498 --close remove debug line
FS-5619 --resolve
FS-5617 --resolve