Aug6 53x Merge

Aug 6 optimizations and macro updates to merge to 53x branch