Merge "Updated makefiles" into rvc-dev