I was right all along!!!!
Merge branch 'develop'