Instrumented intent handlers
Corrected numUIBlocks
Merge branch 'develop'