Merge "Update Mass PNF simulator path"