Simplified the build
Merge commit '64f5900'