Merge "Refactoring: Support alt. network time source"