Merge "Makefile: Update the minor version to indicate 2.4 release" into integration