Fixes: (0001691) Image awareness Truncation code
Bugfix-merge conflict
Merge branch 'v10' of https://github.com/chrisgraham/ocPortal into v10