chore: merge updates from Clifton