Cherry picking 3461b59 to fix incorrect diameter function
Changing version number