t610 move code from t610 to t610d - solve aria-hidden in assessment + fix merge issues generated from resolved branch