Merge "Add more border space options" into tm-dev