reinstate shortand resolution notation
Merge from upstream.