merge flash bugfix from 5.5.2