Finish Release-2.1.4
Updated Analytics target
Merge branch 'develop'