reformat xborder (ABM-141)
Merge branch 'reformat-code' into develop