Merge branch 'pr/n181_MaceWindu'
Fixed formatting.
Merge branch 'pr/n181_MaceWindu'
Additional case of mapping to explicit interface implementation