[CR] scaffold updates