LPS-31785  PROTOTYPE

NO MERGE