p2 #7

Closed
pb4nq52pf wants to merge 7 commits from branch_ltt into feature/cx