Merge integration into deployment-portage for release 4.1.1+portage-4.7.0
#1309
+6,769
−1,217