latest updates from camael
merged