Re: Final review of L1SAP ported to current maste