Merge "Integration tests for 16kb dev option" into main