Another merge but on a separate branch so we may hit the same issues with a conflict with master in past... we'll see.
added zooms label
requested review from @matthieu
assigned to @matthieu
mentioned in commit cbd8bc41
merged