[TASK] Backport Flow property mapper