Will comments query/template blocks be include in 5.9? Currently I only have them with GB plugin.