Feature #5621