Merge "fix: remove useless "return" at void functions" into integration