v0.4: border management improved
same
conflicts