57 Commits (avadesian-patch-1)