Config update and fix c9a834 and 660988 merge