CON-1787: Fix for encoding section content