Uncleaned commit, but consensus OK for SP limits
Add testcase, uncleaned
Cleanup