Tragetaschen/cross compile slash

Adding follow-up commits to complete #940