[sprint 47 SAT-873, SAT-911 resolved issues and some modification]