Merge "Adding testing for optimized flash super" into main