[389-commits] Commit: two retro cl patches