publish: merged dev

generated from commit 777682f7804df117cc8566b9ec510450a63aefb5