Ci3

Merging the current CI3 branch into master for future merge into the main branch.