Case 3559 - Added button filtering.
Case 3559 - Minor warning fix.
Merge branch 'develop'