AP-10-809

runs with PC-19-010