Merge "Include the algorithm header file" into devel/master