Merge "Add missing header" into devel/master