Merge "FP2-429: "Connected" character display incomplete" into fp2-dev-v2