CLS-6 #comment Keep an aardvark
CLS-6 #resolve-issue Merge branch 'jzempel/aardvark' into master