Fix build process

Erick Hitter requested to merge fix/context into master

Merge request reports