Merge branch 'before_scaleup'