flash part merged into master
flash part merged into master