[issue-311] Yoda