Merge "Fix testBlockRule_ParentBlocksChild() from RefControlTest" into stable-2.9