Merge "Update Makefile and scripts after Quick removal."