Fixed division by zero
Merge branch 'FEAT_LatestMedia' into Weekly2