Bringing develop up-to-date with master

I inadvertently merged feature/NOW-188 on to master. Now bringing master on to develop to get the commits that feature/NOW-188 has.