Test for boundary condition
Merge branch 'user-icon'