Resolve #2661710 "Problems with schema"

sorlovrequested to merge
issue/page_manager-2661710:2661710-problems-with-schema into 8.x-4.x

Closes #2661710

Merge request reports