Merge branch 'Adar'
match function skeletons for UI
Merge branch 'master' into Adar