Changes from #838 to #839

#838 (27-Jul-2019 11:04:20)

  1. https://github.com/cloudstore/cloudstore/issues/87 (commit: 7b122dfda87d6fdb1a76bced37d249ecdd0f55ec) — marco / detail
  2. https://github.com/cloudstore/cloudstore/issues/86 (commit: 5fdead85086b39454e2e8e7dca7518ec397ddf46) — marco / detail