merge install related changes from master #3047 to RC0.7.4_master