Update handling of dynamic and download index fields (should use on instead of true)
Exclude nap profile stuff
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x