Forwarded PR: cockpit #12

Open
adamm wants to merge 3 commits from PR_cockpit#9 into master

@ -1 +1 @@
Subproject commit 23892eda9a470f850c314701b89758e4eba10f7a61e45b0e9ad5971ede13cebd
Subproject commit 338985b5800070a11fb3a4098ef3ddb2d92b44eca9c83dfd48569aaec9c733b9