merged nrach for ticket_1331 into master