Change priority of re-execution handling and allow client to render NotFound contents

Change priority of re-execution handling and allow client to render NotFound contents #9647