Merge "Add more reverse support to AnimatedVD" into lmp-dev