SCATTER-153 frame limit isn't as hard, at least for testing/commissioning we need to allow more frames
Merge branch '8.32'