Merge pull request #628 from pshevtsov/super-annotations-xOptView