added nissing deprecated annotation
Merge branch 'nightly' into marmot
Merge branch 'marmot' into builder