Merge changes I5a26c853,Ie4ec660a

* changes:
  Implements disableNanoApp
  Implements enableNanoApp