Team octopus/trailer 109

Merging version 1.0.9 changes + some minor fixes