merge config and initializer files over to 4.2