Merge "Fix UTC prevent issue" into devel/master