[DON'T REVIEW YET] LPS-38423 Fix security issues