[#41182563] Fixed small cosmetically issues