Merge "Externalize AssignPnf Building Block and refactor existing code accordingly"