Ticket/imkingdavid/11334

Fixed all mentioned issues from your PR