LPS-33679 Apply pattern in missing places