Enhancement: Update branch with latest upstream changes