Updating more case issues
Updating more case issues
Merge origin/master