merge with default, feature freeze for 1.3
rest: fix typo, document default psy-rdoq value
analysis: missing braces caused a bug in CABAC context save for rd=2
Merge with stable