Add 2013-12-19-resolve-target-entity