SAM #73, #74 and #75

Notes
=====

* Tickets implemented: SAM #73, #74, #75