macro and __LINE__ to indicated the caller position
Merge branch 'topic/28_named_retry' into v1-devel