LPS-47664 Allow before and after