stable/grizzly

Change-Id: I3dbc90b2d5df9c40ce44d6ac3bed6231bf41cdc0
Merge branch 'functions-update' into dt-test
Merge branch 'pretty-up' into dt-test
Merge branch 'stable-grizzly' into dt-test