Two more entries from the highly productive PRs of mihira-san yoshiro <sanpei@sanpei.org>.
Two more entries from the highly productive PRs of mihira-san yoshiro
<sanpei@sanpei.org>.

PR:	17622,18126

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase