Merge "Fix static analysis issue" into devel/master