LPS-42644 add baseline support