Merge "Fixup Augmentable and Identifiable methods changing"