2.1.5 Release: fix comment border pos