Merge "Containers time zone sync"