[archimedes]: Fixed minor issue
Merged master into new_client branch