Merge "Assets were drawn in the wrong timezone." into jb-mr1-dev