Updated from smcp-0.5-11-gc9eda27