add special case and detail
Merge branch 'master' into developer