Code tidy in response to review
Code tidy
Merge branch 'mbst-6116-bt-featuredcontent' into stage