Merge pull request #2783 from hanakin/ticket/12862

[ticket/12862] Add Border

* hanakin/ticket/12862:
  [ticket/12862] Add Border