Feature: Rebase upstream master

Rebased to upstream master...