Latest updates for MSS Code Factory 2.1