Adiq server changes
Merged