Merge commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9' * commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9': Fixing the broken build