Merge branch 'Issue-2393929' into 7.x-1.x
Issue #2394411: Check existence of bid property on blocks before attempting to access it
Merge branch 'Issue-2394411' into RC