clear-onprem #5

Closed
artem.drozdov wants to merge 14 commits from clear-onprem into main