Merge branch 'sr/am-show-final-message-in-applying-indicator'