Full source included. This closes TA135864