added change log and breaking modifications. cleaned up merge from kashif-umair