sync with latest asr changes
reducing the delta between master and portable