Merge "Adding include to functional" into main