Merge "Proper adjustment of filterlength for downsampling"