SS-612 Rebased our changes to updated master

@nayao more blessings needed.