Merge "Add missing <functional> include" into main