Merge pull request #5321 from urisimchoni/prof-lin