Merge "Fix class initialization issue"