v1.0.8-alpha1: Updated latest changes
Signed-off-by: jfederico <jesus@123it.ca>