Merge "Fixed a couple of runtime issues due to the existing support for the legacy...