Merge "Fix inexact argument type warning"