Changes for deferred attachment URL retrieval & contineOnError support.