Merge commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111' * commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111': Fix handling of application disabled state.
Merge commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111' * commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111': Fix handling of application disabled state.