Fix swap samples action for A->B B->A swap in the same resource
Fix specs