Merge "Adding Activity Action entry"