Updated from smcp-0.6-12-gdabfab9