Merge updates to bryce branch for labtest simulation to master.