Merge remote-tracking branch 'origin/ticket52' into stg-2.409