Merge "Layer2 suite - change to current director"