add missing app dependency
merge bug26160 into stable
merge stable into default