Add feature code for combined BLF
Merge branch 'release/2.11' into release/12.0

Conflicts:
	module.xml
Version Bump
Merge branch 'release/12.0' into develop