Hey @amohammadi,
Another possible solution for !62 (closed)
The goal of this MR was to do with minimum intervention as possible in the legacy code.