Thor P02Cbasics update
Merge branches 'master' and 'Thor'