Merge "Changes needed to automate post installation configurations" into cord-4.0