Pull M1.3 changes

Pull changes from the last sprint into master