Merge "Clean makefile and fix provider" into devel_3.0_main