Revert "Revert "SIPI""

This reverts commit a30564bc51e8dd9b8a2dc1b96ce261bcc818bf40.