Merge "Fixed errors in HandlePnf flow" into dublin