fix annotation border
merge master with master