Merge updates from boilerplate