blackbox/whitebox separation delayed until M7
Merge pull request #261 from xeno-by/master

blackbox/whitebox separation delayed until M7