Compatible with builder
Merge pull request #1799 from VisualSJ/develop-3.0

Compatible with builder