#509 Enhance app master settings