April fixes and data updates

Change-Id: I33bf3e74c62a95fde95bf067b4e2c4b1f0e9e27d
Merge branch 'master' into develop