Merge "Additional functionality for the noti asst"