Some patches from poi#1540

tonyqus merged 9 commits into

nissl-lab:masternissl-lab/npoi:masterfrom

antony-liu:poi/v3.17-patch2antony-liu/npoi:poi/v3.17-patch2Copy head branch name to clipboard