MBS-6529: Re-introduce missing parts from previous revert