TH-09 | Enhance manual input of AP
Merge branch 'TH-09' into dev1.0