LPS-31315 comment out temporarily