closes #2946
Merge branch 'release/1.54'