#25424
#25412
Merge branch 'master' of https://github.com/Loud-Clear/pro99