Merge "Prevent API generate warning log" into devel/master