BuildListOptimizer:
Merged applied changes from testing branch to master