1) Fix versioning from double merge (#380) (dycw)
(SHA: c0ab032dac557596d425c0ecd8db803778211925)