r24 changes merged into master branch

Code revision r24 added to our project, hfsm tests disabled in
evaluator, executor configured for quick tests.