Abdev

Merge changes