Merge "Fix the warning log in Control causing the wrong position" into devel/master