ASDI - Commit 7/22/13