+++ This bug was initially created as a clone of Bug #21266 +++ Many of the some changes should be made to the self checkin templates