update for aldebaran
Merge commit '6f78ae4d6c71e02879ce952e89f2477dab05a694'