Merge "Adding role for application handling"