Issue #3402817 by marcofernandes: Add override registerCoreBlocks(); Update core blocks for selection;
Closes #3424778