Fixing build error.

[#0]
Fixing Linux build error
Merge remote-tracking branch 'remotes/origin/develop' into PAT-EC2