Queue and fix metadata reload glitch.
Merge remote-tracking branch 'origin/master'