Updated from master with spec for LD29