Migrated to commend-based annotation bean definition
Merged changes