doc: manually merge branch doc/fx+demo/class to master