Merge "Adding force_flash functionality" into main