Merge "Fix compile warning / incomplete initialization"