Manually merged from fix8:main to fix8:dev