Upstream 2018-03-01
Qt Port and FM7 series 2018-03-26