patches from !770 (closed), will not change behaviour. resolved merge conflict due to addDynamicDeviceActions
