Bottle server dev

Merge of Bottle Server development into main branch