uci: Backport security fixes