song view core fixes
Merge branch 'master' into oext
provoda improve
provoda improve
Merge branch 'master' into oext