Merge "Add reminder in the code to fix T-junctions"