Merge latest commits from compulab on dev branch