Noassert

switched pull request to target develop branch