Save modified attributes only and nl2br filter added
Merge origin/master