update hot fix + new CRs
update FMP-15, FMP-16