Merge "Customisable selection padding on diagrams"