Cherry picked the blinkbox modifications from v1.1.5 onto v1.2.8