Upstream 2018-11-23
Qt Port and FM7 series 2018-11-24