Merge "Handle missing static for CREATOR"