iPER-21530

iPER-21530