Code 11 sp3

already reviewed for master