Merge "Address ANAPIC feedback"