Merge branch 'tt/misc' into dev