Merging previous changes
Signed-off-by:thehutch