Merge branch 'master' into S6690-subrecords-tablesorter

1 job for S6690-subrecords-tablesorter in 12 minutes and 16 seconds (queued for 2 seconds)