Merge branch 'master' into 'fix/boost-console-feed-1596'
# Conflicts: # src/app/modules/boost/console/booster/booster.component.html # src/app/modules/boost/console/booster/booster.component.spec.ts
# Conflicts: # src/app/modules/boost/console/booster/booster.component.html # src/app/modules/boost/console/booster/booster.component.spec.ts