Merge master with upstream

@CyberSecutor