Merge branch 'sg/cocci-move-array'