forwarding delete with alias support
Merge branch 'ForwardingDeleteWithAlias' into dev