Merge remote-tracking branch 'mdw/mdw/powm-sec'