Cr 1234

CR-1234 from hudson just adds comments