Fixing broken task order for assemble task
Merge branch 'develop' into feature/retrofit_favorites