Merge "Add command line support for testing tz detection" into rvc-dev