CID-1240106 Remove unused variable
CID-1240107 Remove unused variable
Fix for CID-1232333, CID-1232334, CID-1232335, CID-1232336 and
CID-1232337
Merge branch 'bugfix/CID-1232333'
Merge branch 'bugfix/CID-1240106'