[dev-context] two patches