Merged latest upstream changes into ARC-support