Merge "bluval engine refactoring"