Merge "Make conversion functions non-inline" into pi-dev