Merge "synching up portal config again"