[ADD] added functional field annotation support
[MERGE] merged framework updates