Merge back from master (ticket CAAT-1793)

Merge back from master (ticket CAAT-1793)