Merge "Optimize 'noservices' condition"