Task 5503

Next part of previous commit
Task 5503
Task 5499
Task 5540
Task 5545
Task 5555
Task 5558