merging from upstream - stage 4