ECMS-5822: Fix the problem relates to the FlashScope bean