Add missing Advisor
Merge changes forward