SOL006ed331 FEAT16 - SAL
This issue is to track the implementation of FEAT16 - SAL.