Dev#13881 Lekiosk

Ghost User requested to merge dev#13881-lekiosk into master

Merge request reports