Initial update for closing trac ticket.

reviewer @adiroiban