#2348399 tested by @mmilutinovic1313
#2340713 This needs to be further documented / tested but this will be finding its way into dev shortly.