Merge "Add commom 1.1 to composer 2.2" into pi-dev