Merging dev branch content into master (WIP).
Fix reports directive and partial (WIP).