SI-6678 Make currentMirror macro hygenic
Merge pull request #3789 from clhodapp/fix/SI-6678

SI-6678 Make currentMirror macro hygenic