Merge "Update in pnfsimulator code."