CON-1296 | WikiaDispatchableObject fixes after CR