RC3 update

updates for FLAT RC3