Fixed conflicts after merge dev-rel