fixed image locations and references
upstream merge