Merge commit 'd9b709f3075d1060f9279d366a278e9b2362367e' into panorama_flash_fix