Merge branch 'Accomodate-DSA-front-end-into-Ocelot'