Merge "Add imgSrc to GetAttribute return map if available" into devel/master