Merge doc blocks commit
Merge touch commit