SLX-236 | fix 296
Merge branch 'SLX-236' of git.mobileinno.com:psyncgui into SLX-236