- Fix performance (lockup) issue when saving block attribute values
Merge branch 'origin/master'