Fix for infinite loop fix.
Merge branch 'master' into production