Instead of doing large restructure for AEROGEAR-8687 we can resolve this problem separately. Best to do that by small chunks of work and restoring optimistic responses on startup in this ticket. This work will make the entire solution solid while AEROGEAR-8687 could be documented as a limitation for our API and it will have a very simple workaround for the moment and can be resolved at any stage.