v1.81-test-control-panel branch into 1.81