Merge branch 'changes_jan' into testing

1 job for testing in 4 seconds