First commit (transferred from Alicium 3.x)