Merge branch 'scaffold_change' (reverted from commit f8630cd6a5a3e03e1725ae5261104d4bde2b7ddb)