check country and storage before create reference
Merge branch 'issue-38' into develop