Revert "Revert "Updates for sense""

This reverts commit 53d70271914a5c35901a5e63c4f860500d80ad5c.
Updates from M7