Fix head meta duplication per issue #1114
Merge remote-tracking branch 'upstream/develop' into develop