Merge branch release/4.0 into dev

Missing radix parameter.