WP-697 Changes for better backward compatibility with already distributed themes