Merge "style: fix functions definitions" into integration