Merge "Handle NotImplemented flavor exception"