#ta-8 add fxed register form work 1.5h
Merge remote-tracking branch 'origin/master'