Merge "Add brokenImageUrl configuration" into devel/master