[merge-work] D675 changes commit to merger-work branch, maestro