Squash Commit 3.0.100

Squash commit from CM for 3.0.100 and all previos commits