Merge "[327182] - fix: Custom label on connection fails to generate createContents()"