Add alias to profile at context content block
Merge branches 'ActionItem2888' and 'stable' into stable