Pushing merge changes from Erocs' branch to this fork.