resolved issues of sprint 47 SAT-925