Merge from upstream

Run-up before development