LPS-44342 Re-add methods, using new approach, as they are used by our plugins
LPS-44342 SF