LPS-34846 revert changes (breaking tests)
LPS-34107
LPS-34982 - Actions