Merge branch 'UpdatePhaseField' into 'master'

Update phase field

See merge request !477
110 jobs for master in 565 minutes and 16 seconds (queued for 14 seconds)