Fixes #16415 - Accept unwrapped hash with 'layout' attribute
(cherry picked from commit eb9a7a4973790e27ba930640407eb77d7aa97d65)
Fixes #16415 - Accept unwrapped hash with 'layout' attribute
(cherry picked from commit eb9a7a4973790e27ba930640407eb77d7aa97d65)