Merged Makefile changes from user_id_migration