Merge "Fix -Werror=old-style-cast error" into devel/master