tanay:213: added f1 feature
tanay:215: added f3 feature
Merge branch 'dev-215-f3' into dev