Initial check-in from AVENUE SVN r4580