Features 5515 and 5397

See https://tracker.silverpeas.org/issues/5515

Do not forget to check out Silverpeas-Components...