Improved installation and configuration process - Check in 5-08052013