Merge "Add focusdirection annotations to cluster methods"