Merge branch 'hotfix/2.2.6'
* Resolved pointer issue for inputs * added indicator to active input
Merge branch 'hotfix/2.2.7' into development