Generally agree. All changes for me are cherry-picked to master only.