Merge to master for Pancan

Mostly finalised