Merge "lib.sh: persistent cfg01, mas01 mcpcontrol"