@stroilova @shnayder please verify that I have updated these files
correctly. @catong complete the thread started in email.