Re #9442. Remove unrequired definition of pi.
Merge branch 'feature/9442_for_valgrind_jobs' into develop