LPS-50595 SF
LPS-50785 remove unthrown exception
LPS-50682 SF