- added many more comments - removed very obsolete 1.x refs (cherry picked from commit cf43e0d605)
cf43e0d605