Merge "Fix logic resolving topic"