Merge "Wrapped asserts in critical code with CONFIG_DEBUG"