BACKLOG-5201: Handle extended properties