brought master up to date with all changes from tb_lab_uncompress branch - did not merge due to git not being able to handle all the changes correctly