Making nikki happy
Merge remote-tracking branch 'reosarevok/mbs-4632' into beta

* reosarevok/mbs-4632:
  Making nikki happy