Update functional from master.