for master swaps

Change-Id: Ib7dc8e3561e05b2313f4e062ca624c4c07609cee