Added instructions regarding new config loading and upstream change merging