Security bug issue ref: 7026D5C6-A4DE-8BB8-91E47AED489AA4BD
bugs improvements