Merge "Fix for -Pintegrationtest profile"