Cherry-pick branch 'patch_to_enableBean_conditionally' into 'release/0.10'

patch to conditionally enable this bean.

See merge request !128 (merged)

(cherry picked from commit e5e1da14)

45c02fdb patch to conditionally enable this bean. 0ddc2afe updated docs and property name. 981deb63 updated notice