634 - Added tooltips
Merge branch 'development' into dev/j2/common