Sync back to Shallem master

Sync back to Shallem master