Merge branch 'patch_to_enableBean_conditionally' into 'master'

patch to conditionally enable this bean. [no rc]

See merge request !128

(cherry picked from commit e5e1da14)

45c02fdb patch to conditionally enable this bean.
0ddc2afe updated docs and property name.
981deb63 updated notice
1 job for !129 with cherry-pick-e5e1da14 in 39 seconds (queued for 8 seconds)
latest merge request