Merge branch 'stable-2.16' * stable-2.16: Adapt injection of UrlFormatter to DynamicItem Change-Id: Iabe82a50f4d4207676b1f0235b0f383374bda932