Merge "Deprivilege haiku"