Issue #2082771 by mxlav: Fixed Warnings after saving content.