Feature/plabee master

This change is necessary for running mobile functional tests.