Merge "Update inventory dependencies in Makefile"