LPS-36734 Follow same pattern as in wiki