Merge "Avoid master queries on image history view"