XWIKI-10109: Align aspects locations