Updated from smcp-0.6-15-gcb5ec68