refs 7838 modified manifestation search
Merge remote-tracking branch 'origin/master'