LPS-42083
LPS-42083 SF
LPS-42083 - apply to tests
LPS-42083 - fix integration tests