Merge with cpasmoi changes and my own local ones