merge install related changes from master #3047