Initial checkin of next release cycle: 6.49