Completion refinements

Philip Makedonskirequested to merge
dev into master

Merge request reports