re #3095 added alias
Merge remote-tracking branch 'origin/feature/3095_offsetX_new_Alias'