t610 Fix aria-hidden in assessment  + Fix merge issues