Merge changes from upstream - variable intensity values