Update no_config patch
Add return status patch