Sync with upstram fix: inner values should not be overwritten by outern values.