Wiki review process: rebased with the latest master and all the problems fixed