Merge branches 'fix_doc', 'general_for' and 'mmbuilder_fixes_and_tests' into wip