LPS-35986 Applied the pattern from Journal