Preserve decimal part of variables (#13604)

Change-Id: Iea98a116da330e85106a8ad802bd6ff4a86472f5