Fixes issue where second version on a single page did not get rendered
Merge remote-tracking branch 'origin/develop' into develop